From 3ae3cd58a8915d71c6b829547e624ff2728fdd10 Mon Sep 17 00:00:00 2001
From: Cliff Li <lic@student.ethz.ch>
Date: Sun, 4 Mar 2018 13:18:41 +0100
Subject: [PATCH] Refactoring: Pages with multiple views are in one directory
---
src/index.js | 12 ++++++------
src/views/{ => events}/eventDetails.js | 12 ++++++------
src/views/{ => events}/eventList.js | 2 +-
src/views/{ => jobs}/jobofferDetails.js | 6 +++---
src/views/{ => jobs}/jobofferList.js | 4 ++--
src/views/{ => studydocs}/studydocList.js | 8 ++++----
src/views/{ => studydocs}/studydocNew.js | 12 ++++++------
7 files changed, 28 insertions(+), 28 deletions(-)
rename src/views/{ => events}/eventDetails.js (94%)
rename src/views/{ => events}/eventList.js (95%)
rename src/views/{ => jobs}/jobofferDetails.js (80%)
rename src/views/{ => jobs}/jobofferList.js (91%)
rename src/views/{ => studydocs}/studydocList.js (89%)
rename src/views/{ => studydocs}/studydocNew.js (93%)
diff --git a/src/index.js b/src/index.js
index 7f2ae35e..b61b3dbb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,9 +1,9 @@
// src/index.js
import m from 'mithril';
-import studydocList from './views/studydocList';
-import studydocNew from './views/studydocNew';
-import eventList from './views/eventList';
-import eventDetails from './views/eventDetails';
+import studydocList from './views/studydocs/studydocList';
+import studydocNew from './views/studydocs/studydocNew';
+import eventList from './views/events/eventList';
+import eventDetails from './views/events/eventDetails';
import profile from './views/profile';
import layout from './views/layout';
import amivLayout from './views/amiv/amivLayout';
@@ -13,8 +13,8 @@ import statuten from './views/amiv/statuten';
import contact from './views/contact';
import aufenthaltsraum from './views/amiv/aufenthaltsraum';
import board from './views/amiv/board';
-import jobOfferList from './views/jobofferList';
-import jobOfferDetails from './views/jobofferDetails';
+import jobOfferList from './views/jobs/jobofferList';
+import jobOfferDetails from './views/jobs/jobofferDetails';
m.route(document.body, '/', {
'/': {
diff --git a/src/views/eventDetails.js b/src/views/events/eventDetails.js
similarity index 94%
rename from src/views/eventDetails.js
rename to src/views/events/eventDetails.js
index 82bddd7d..efd05e48 100644
--- a/src/views/eventDetails.js
+++ b/src/views/events/eventDetails.js
@@ -1,11 +1,11 @@
import m from 'mithril';
import * as EmailValidator from 'email-validator';
-import * as events from '../models/events';
-import { log } from '../models/log';
-import { isLoggedIn } from '../models/auth';
-import inputGroup from './form/inputGroup';
-import button from './form/button';
-import JSONSchemaForm from './form/jsonSchemaForm';
+import * as events from '../../models/events';
+import { log } from '../../models/log';
+import { isLoggedIn } from '../../models/auth';
+import inputGroup from '../form/inputGroup';
+import button from '../form/button';
+import JSONSchemaForm from '../form/jsonSchemaForm';
class EventSignupForm extends JSONSchemaForm {
oninit(vnode) {
diff --git a/src/views/eventList.js b/src/views/events/eventList.js
similarity index 95%
rename from src/views/eventList.js
rename to src/views/events/eventList.js
index a2d26d15..bfff73eb 100644
--- a/src/views/eventList.js
+++ b/src/views/events/eventList.js
@@ -1,5 +1,5 @@
import m from 'mithril';
-import * as events from '../models/events';
+import * as events from '../../models/events';
const date = `${new Date().toISOString().split('.')[0]}Z`;
diff --git a/src/views/jobofferDetails.js b/src/views/jobs/jobofferDetails.js
similarity index 80%
rename from src/views/jobofferDetails.js
rename to src/views/jobs/jobofferDetails.js
index 04f31b8a..6ee763d8 100644
--- a/src/views/jobofferDetails.js
+++ b/src/views/jobs/jobofferDetails.js
@@ -1,7 +1,7 @@
import m from 'mithril';
-import { apiUrl } from '../models/config';
-import * as jobs from '../models/joboffers';
-import { log } from '../models/log';
+import { apiUrl } from '../../models/config';
+import * as jobs from '../../models/joboffers';
+import { log } from '../../models/log';
export default class JobOfferDetails {
static oninit(vnode) {
diff --git a/src/views/jobofferList.js b/src/views/jobs/jobofferList.js
similarity index 91%
rename from src/views/jobofferList.js
rename to src/views/jobs/jobofferList.js
index ba5aa427..57767953 100644
--- a/src/views/jobofferList.js
+++ b/src/views/jobs/jobofferList.js
@@ -1,6 +1,6 @@
import m from 'mithril';
-import { apiUrl } from '../models/config';
-import * as jobs from '../models/joboffers';
+import { apiUrl } from '../../models/config';
+import * as jobs from '../../models/joboffers';
const date = `${new Date().toISOString().split('.')[0]}Z`;
diff --git a/src/views/studydocList.js b/src/views/studydocs/studydocList.js
similarity index 89%
rename from src/views/studydocList.js
rename to src/views/studydocs/studydocList.js
index 6368107c..2b05d290 100644
--- a/src/views/studydocList.js
+++ b/src/views/studydocs/studydocList.js
@@ -1,8 +1,8 @@
import m from 'mithril';
-import * as studydocs from '../models/studydocs';
-import { apiUrl } from '../models/config';
-import { isLoggedIn } from '../models/auth';
-import { Error401 } from './errors';
+import * as studydocs from '../../models/studydocs';
+import { apiUrl } from '../../models/config';
+import { isLoggedIn } from '../../models/auth';
+import { Error401 } from '../errors';
const tableHeadings = [
diff --git a/src/views/studydocNew.js b/src/views/studydocs/studydocNew.js
similarity index 93%
rename from src/views/studydocNew.js
rename to src/views/studydocs/studydocNew.js
index ec997bdb..dae1f408 100644
--- a/src/views/studydocNew.js
+++ b/src/views/studydocs/studydocNew.js
@@ -1,10 +1,10 @@
import m from 'mithril';
-import * as studydocs from '../models/studydocs';
-import { isLoggedIn } from '../models/auth';
-import { Error401 } from './errors';
-import inputGroup from './form/inputGroup';
-import selectGroup from './form/selectGroup';
-import button from './form/button';
+import * as studydocs from '../../models/studydocs';
+import { isLoggedIn } from '../../models/auth';
+import { Error401 } from '../errors';
+import inputGroup from '../form/inputGroup';
+import selectGroup from '../form/selectGroup';
+import button from '../form/button';
export default class studydocNew {
oninit() {
--
GitLab