xrazis
/
ichnaea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

General code refactor 

Removed useless code | formated files
main
Haris Razis 4 years ago
parent
bb848db15c
commit
26db0473e9
16 changed files with 36 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 12
      .idea/runConfigurations/dev_client.xml
  3. 12
      .idea/runConfigurations/dev_server.xml
  4. 12
      .idea/runConfigurations/run_client.xml
  5. 12
      .idea/runConfigurations/run_server.xml
  6. 22
      server/routes/athletes.js
  7. 2
      server/routes/user.js
  8. 6
      web/public/index.html
  9. 12
      web/src/components/Navbar.vue
  10. 2
      web/src/slims-vuex.d.ts
  11. 10
      web/src/store/modules/athletes.ts
  12. 2
      web/src/store/modules/backend.ts
  13. 6
      web/src/views/Athletes.vue
  14. 7
      web/src/views/DashboardHome.vue
  15. 2
      web/src/views/Login.vue

2
.gitignore
View File

@ -106,5 +106,7 @@ dist
.idea/workspace.xml .idea/workspace.xml
.DS_Store .DS_Store
/dist /dist
mongo_example_swarmlab.js mongo_example_swarmlab.js

12
.idea/runConfigurations/dev_client.xml
View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="dev client" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/client/package.json" />
<command value="run" />
<scripts>
<script value="dev" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>

12
.idea/runConfigurations/dev_server.xml
View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="dev server" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/server/package.json" />
<command value="run" />
<scripts>
<script value="dev" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>

12
.idea/runConfigurations/run_client.xml
View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="run client" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/client/package.json" />
<command value="run" />
<scripts>
<script value="run" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>

12
.idea/runConfigurations/run_server.xml
View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="run server" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/server/package.json" />
<command value="run" />
<scripts>
<script value="run" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>

22
server/routes/athletes.js
View File

@ -28,33 +28,19 @@ router.get('/api/athletes/:id/edit',
async (req, res) => { async (req, res) => {
const athlete = await Athlete.findById(req.params.id) const athlete = await Athlete.findById(req.params.id)
res.send(athlete) res.send(athlete)
} });
)
;
router.put('/api/athletes/:id', router.put('/api/athletes/:id',
requireAuth, requireAuth,
celebrate(athleteUpdateSchema, guid), celebrate(athleteUpdateSchema, guid),
async (req, res) => { async (req, res) => {
const {name, _trainer} = req.body const {name, _trainer} = req.body
const updateAthlete = {name, _trainer} await Athlete.findByIdAndUpdate(req.params.id, {name, _trainer}, {}, (err, athlete) => {
if (_trainer === '') {
updateAthlete._trainer = undefined
await Athlete.findByIdAndUpdate(req.params.id, updateAthlete, {}, (err, athlete) => {
if (err)
return res.status(400).json({errors: 'Something went wrong!'});
return res.send(athlete)
})
} else if (name || _trainer)
await Athlete.findByIdAndUpdate(req.params.id, updateAthlete, {}, (err, athlete) => {
if (err) if (err)
return res.status(400).json({errors: 'Something went wrong!'}); return res.status(400).json({errors: 'Something went wrong!'});
res.send(athlete) res.send(athlete)
}) })
}); });
router.delete('/api/athlete/:id', router.delete('/api/athlete/:id',
@ -62,8 +48,6 @@ router.delete('/api/athlete/:id',
celebrate(guid), celebrate(guid),
async (req, res) => { async (req, res) => {
await Athlete.findByIdAndDelete(req.params.id) await Athlete.findByIdAndDelete(req.params.id)
} });
)
;
module.exports = router; module.exports = router;

2
server/routes/user.js
View File

@ -22,14 +22,12 @@ router.put('/api/user/:id',
if (isMatch) { if (isMatch) {
const user = {username, email, newPassword} const user = {username, email, newPassword}
await User.findByIdAndUpdate(req.params.id, user) await User.findByIdAndUpdate(req.params.id, user)
res.send(req.user); res.send(req.user);
} }
}); });
} else if (username || email) { } else if (username || email) {
const user = {username, email} const user = {username, email}
await User.findByIdAndUpdate(req.params.id, user) await User.findByIdAndUpdate(req.params.id, user)
res.send(req.user); res.send(req.user);
} }

6
web/public/index.html
View File

@ -2,9 +2,9 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta content="IE=edge" http-equiv="X-UA-Compatible">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link href="<%= BASE_URL %>favicon.ico" rel="icon">
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
</head> </head>
<style> <style>

12
web/src/components/Navbar.vue
View File

@ -1,19 +1,17 @@
<template> <template>
<nav class="navbar is-fixed-top is-black" role="navigation" aria-label="main navigation"> <nav aria-label="main navigation" class="navbar is-fixed-top is-black" role="navigation">
<div class="navbar-brand"> <div class="navbar-brand">
<router-link to="/"> <router-link to="/">
<a class="navbar-item"> <a class="navbar-item">
<img src="../assets/undraw_server_q2pb.svg" width="60" height="150"/> <img height="150" src="../assets/undraw_server_q2pb.svg" width="60"/>
<h3 class="is-size-4 has-text-white">Ichnaea</h3> <h3 class="is-size-4 has-text-white">Ichnaea</h3>
</a> </a>
</router-link> </router-link>
<a <a aria-expanded="false"
role="button"
class="navbar-burger burger"
aria-label="menu" aria-label="menu"
aria-expanded="false" class="navbar-burger burger"
data-target="navbarBasicExample" data-target="navbarBasicExample"
> role="button">
<span aria-hidden="true"></span> <span aria-hidden="true"></span>
<span aria-hidden="true"></span> <span aria-hidden="true"></span>
<span aria-hidden="true"></span> <span aria-hidden="true"></span>

2
web/src/slims-vuex.d.ts
View File

@ -1,4 +1,4 @@
import { Store } from '@/store';// path to store file import {Store} from '@/store'; // path to store file
declare module '@vue/runtime-core' { declare module '@vue/runtime-core' {
interface ComponentCustomProperties { interface ComponentCustomProperties {

10
web/src/store/modules/athletes.ts
View File

@ -8,7 +8,7 @@ export interface AthleteInterface {
id: string, id: string,
socketID: string, socketID: string,
name: string, name: string,
_trainer: string _trainer: string | undefined
} }
@Module @Module
@ -34,15 +34,15 @@ export default class Athletes extends VuexModule {
return this.err return this.err
} }
@Mutation save_trainer(trainer: UserInterface) {
this.trainer = trainer;
}
@Mutation @Mutation
private save_athlete(athlete: AthleteInterface) { private save_athlete(athlete: AthleteInterface) {
this.athlete = athlete; this.athlete = athlete;
} }
@Mutation save_trainer(trainer: UserInterface) {
this.trainer = trainer;
}
@Mutation @Mutation
private api_athletes(athletes: [AthleteInterface]) { private api_athletes(athletes: [AthleteInterface]) {
this.athletes = athletes; this.athletes = athletes;

2
web/src/store/modules/backend.ts
View File

@ -4,7 +4,7 @@ import {Module, Mutation, VuexModule} from 'vuex-module-decorators'
export default class Backend extends VuexModule { export default class Backend extends VuexModule {
private serverStatus = false private serverStatus = false
get currentStatus() { get currentServerStatus() {
return this.serverStatus return this.serverStatus
} }

6
web/src/views/Athletes.vue
View File

@ -28,7 +28,7 @@
</tr> </tr>
</thead> </thead>
<tr v-for="(athlete, index) in myAthletes" :key="index"> <tr v-for="(athlete, index) in myAthletes" :key="index">
<td class="is-family-monospace" v-if="athlete.name"> <td v-if="athlete.name" class="is-family-monospace">
<span v-if="athlete.socketID">Online</span> <span v-if="athlete.socketID">Online</span>
<span v-else>Offline</span> <span v-else>Offline</span>
</td> </td>
@ -141,7 +141,6 @@ export default class Athletes extends Vue {
private msg = '' private msg = ''
mounted() { mounted() {
this.myAthletes = [<AthleteInterface>{}]
this.$store.dispatch('getAthletes') this.$store.dispatch('getAthletes')
.then((res: any) => { .then((res: any) => {
this.athletes = res.data; this.athletes = res.data;
@ -159,12 +158,11 @@ export default class Athletes extends Vue {
} }
private removeMyAthlete(athlete: AthleteInterface, index: number) { private removeMyAthlete(athlete: AthleteInterface, index: number) {
athlete._trainer = '' athlete._trainer = undefined
this.$store.dispatch('updateAthlete', athlete) this.$store.dispatch('updateAthlete', athlete)
.then(() => this.myAthletes.splice(index, 1)) .then(() => this.myAthletes.splice(index, 1))
} }
} }
</script> </script>

7
web/src/views/DashboardHome.vue
View File

@ -25,16 +25,17 @@
<div class="tile is-parent is-vertical"> <div class="tile is-parent is-vertical">
<article class="tile is-child box"> <article class="tile is-child box">
<p class="title">System status</p> <p class="title">System status</p>
<p class="subtitle">All systems operational</p> <p v-if="this.$store.getters.currentServerStatus" class="subtitle">All systems operational</p>
<p v-else class="subtitle">Something does not seem right</p>
</article> </article>
<article class="tile is-child box"> <article class="tile is-child box">
<p class="title">...tiles</p> <p class="title">App Info</p>
<p class="subtitle">Bottom tile</p> <p class="subtitle">Bottom tile</p>
</article> </article>
</div> </div>
<div class="tile is-parent"> <div class="tile is-parent">
<article class="tile is-child box"> <article class="tile is-child box">
<figure class="image is-4by3"> <figure class="image">
<img src="../assets/undraw_finish_line_katerina_limpitsouni_xy20.svg"> <img src="../assets/undraw_finish_line_katerina_limpitsouni_xy20.svg">
</figure> </figure>
</article> </article>

2
web/src/views/Login.vue
View File

@ -29,7 +29,7 @@
</p> </p>
</div> </div>
</form> </form>
<div class="m-4" v-if="msg"> <div v-if="msg" class="m-4">
<div class="notification is-danger has-text-centered"> <div class="notification is-danger has-text-centered">
<b>{{ msg }}</b> <b>{{ msg }}</b>
</div> </div>

Write Preview
Loading…
Cancel
Save