Nettoyage et rebranding

Geoffrey PREUD'HOMME
1 parent 8ae24f57
Showing 12 changed files with 67 additions and 133 deletions Show diff stats
app/models/nerd.js -> app/models/membre.js
app/routes.js
public/css/style.css
public/js/app.js
public/js/appRoutes.js
public/js/controllers/MainCtrl.js
public/js/controllers/NerdCtrl.js -> public/js/controllers/MembreCtrl.js
public/js/services/NerdService.js
public/views/home.html
public/views/index.html
public/views/nerd.html -> public/views/membres.html
server.js
-// app/models/nerd.js
-// grab the mongoose module
 var mongoose = require('mongoose');
-// define our nerd model
-// module.exports allows us to pass this to other files when it is called
-module.exports = mongoose.model('Nerd', {
-    login: {
+module.exports = mongoose.model('Membre', {
+    login: { // On récupèrera le nom via les passwd
         type: String,
         default: 'login'
     },
@@ -13,7 +9,7 @@ module.exports = mongoose.model(&#39;Nerd&#39;, {
         type: String,
         default: 'IMA'
     },
-    promo: {
+    promo: { // Nécessaire pour calculer le numéro de section
         type: Number,
         default: 2017
     },
-// app/routes.js
-
-// grab the nerd model we just created
-var Nerd = require('./models/nerd');
+var Membre = require('./models/membre');
 module.exports = function (app) {
-    // server routes ===========================================================
-    // handle things like api calls
-    // authentication routes
-
-    // sample api route
-    app.get('/api/nerds', function (req, res) {
-        // use mongoose to get all nerds in the database
-        Nerd.find(function (err, nerds) {
+    app.get('/api/membres', function (req, res) {
+        Membre.find(function (err, membres) {
             if (err)
                 res.send(err);
-            res.json(nerds);
+            res.json(membres);
         });
     });
-    app.post('/api/nerds', function (req, res) {
-        Nerd.create({
+    app.post('/api/membres', function (req, res) {
+        Membre.create({
             login: req.body.login,
             role: req.body.role,
             section: req.body.section,
-        }, function (err, nerd) {
+        }, function (err, membre) {
             if (err)
                 res.send(err);
-            Nerd.find(function (err, nerds) {
+            Membre.find(function (err, membres) {
                 if (err)
                     res.send(err);
-                res.json(nerds);
+                res.json(membres);
             });
         });
     });
-    app.delete('/api/nerds/:nerd_id', function (req, res) {
-        Nerd.remove({
-            _id: req.params.nerd_id
-        }, function (err, nerd) {
+    app.delete('/api/membres/:membre_id', function (req, res) {
+        Membre.remove({
+            _id: req.params.membre_id
+        }, function (err, membre) {
             if (err)
                 res.send(err);
-            Nerd.find(function (err, nerds) {
+            Membre.find(function (err, membres) {
                 if (err)
                     res.send(err);
-                res.json(nerds);
+                res.json(membres);
             });
         })
     })
-    // route to handle creating goes here (app.post)
-    // route to handle delete goes here (app.delete)
-
-    // frontend routes =========================================================
-    // route to handle all angular requests
     app.get('*', function (req, res) {
-        res.sendfile('./public/views/index.html'); // load our public/index.html file
+        res.sendfile('./public/views/index.html');
     });
 };
 \ No newline at end of file
 html {
     overflow-y: scroll;
 }
+
 body {
     padding-top: 50px;
 }
-#nerd-list {
+
+#membre-list {
 	width: 90 %;
 }
 \ No newline at end of file
-// public/js/app.js
-angular.module('sampleApp', ['ngRoute', 'appRoutes', 'MainCtrl', 'NerdCtrl', 'NerdService']);
 \ No newline at end of file
+angular.module('ciApp', ['ngRoute', 'appRoutes', 'MembreCtrl']);
 \ No newline at end of file
@@ -6,14 +6,13 @@ angular.module(&#39;appRoutes&#39;, []).config([&#39;$routeProvider&#39;, &#39;$locationProvider&#39;,
         // home page
         .when('/', {
-            templateUrl: 'views/home.html',
-            controller: 'MainController'
+            templateUrl: 'views/home.html'
         })
-        // nerds page that will use the NerdController
-        .when('/nerds', {
-            templateUrl: 'views/nerd.html',
-            controller: 'NerdController'
+        // membres page that will use the MembreController
+        .when('/membres', {
+            templateUrl: 'views/membres.html',
+            controller: 'MembreController'
         });
         $locationProvider.html5Mode(true);
@@ -1,6 +0,0 @@
-// public/js/controllers/MainCtrl.js
-angular.module('MainCtrl', []).controller('MainController', function ($scope) {
-
-    $scope.tagline = 'To the moon and back!';
-
-});
 \ No newline at end of file
-// public/js/controllers/NerdCtrl.js
-angular.module('NerdCtrl', []).controller('NerdController', function ($scope, $http) {
+// public/js/controllers/MembreCtrl.js
+angular.module('MembreCtrl', []).controller('MembreController', function ($scope, $http) {
     $scope.formData = {};
-    // when landing on the page, get all Nerds and show them
-    $http.get('/api/nerds')
+    // when landing on the page, get all Membres and show them
+    $http.get('/api/membres')
         .success(function (data) {
-            $scope.nerds = data;
+            $scope.membres = data;
             console.log(data);
         })
         .error(function (data) {
@@ -13,23 +13,23 @@ angular.module(&#39;NerdCtrl&#39;, []).controller(&#39;NerdController&#39;, function ($scope, $h
         });
     // when submitting the add form, send the text to the node API
-    $scope.createNerd = function () {
+    $scope.createMembre = function () {
         console.log('Adding', $scope.formData);
-        $http.post('/api/nerds', $scope.formData)
+        $http.post('/api/membres', $scope.formData)
             .success(function (data) {
                 $scope.formData = {}; // clear the form so our user is ready to enter another
-                $scope.nerds = data;
+                $scope.membres = data;
             })
             .error(function (data) {
                 console.log('Error: ' + data);
             });
     };
-    // delete a Nerd after checking it
-    $scope.deleteNerd = function (id) {
-        $http.delete('/api/nerds/' + id)
+    // delete a Membre after checking it
+    $scope.deleteMembre = function (id) {
+        $http.delete('/api/membres/' + id)
             .success(function (data) {
-                $scope.nerds = data;
+                $scope.membres = data;
                 console.log(data);
             })
             .error(function (data) {
@@ -1,22 +0,0 @@
-// public/js/services/NerdService.js
-angular.module('NerdService', []).factory('Nerd', ['$http',
-    function ($http) {
-
-        return {
-            // call to get all nerds
-            get: function () {
-                return $http.get('/api/nerds');
-            },
-            // call to POST and create a new nerd
-            create: function (nerdData) {
-                return $http.post('/api/nerds', nerdData);
-            },
-
-            // call to DELETE a nerd
-            delete: function (id) {
-                return $http.delete('/api/nerds/' + id);
-            }
-        }
-
-    }
-]);
 \ No newline at end of file
-<!-- public/views/home.html -->
-
 <div class="jumbotron text-center">
-    <h1>Home Page 4 Life</h1>
-
-    <p>{{ tagline }}</p>
+    <h1>Site internet du Club Info</h1>
+    <p>Hey ! Bienvenue sur le site internet du Club Info !<br/>
+    Pour l'instant, on travaille encore dessus, donc n'hésites pas à t'y aventurer, mais prends garde, les erreurs 404 te guettent !</p>
 </div>
 \ No newline at end of file
@@ -8,25 +8,24 @@
         <title>Club Informatique de Polytech Lille</title>
         <!-- CSS -->
         <link rel="stylesheet" href="libs/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="css/style.css"> <!-- custom styles -->
+        <link rel="stylesheet" href="css/style.css">
         <!-- JS -->
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
+        <script src="libs/jquery/dist/jquery.min.js"></script>
         <script src="libs/angular/angular.min.js"></script>
         <script src="libs/angular-route/angular-route.min.js"></script>
-        <script src="js/controllers/MainCtrl.js"></script>
-        <script src="js/controllers/NerdCtrl.js"></script>
-        <script src="js/services/NerdService.js"></script>
+        <!-- APP -->
+        <script src="js/controllers/MembreCtrl.js"></script>
         <script src="js/appRoutes.js"></script>
         <script src="js/app.js"></script>
     </head>
-    <body ng-app="sampleApp" ng-controller="NerdController">
+    <body ng-app="ciApp">
         <div class="container">
             <nav class="navbar navbar-inverse">
                 <div class="navbar-header">
                     <a class="navbar-brand" href="/">Club Info</a>
                 </div>
                 <ul class="nav navbar-nav">
-                    <li><a href="/nerds">Nerds</a></li>
+                    <li><a href="/membres">Membres</a></li>
                 </ul>
             </nav>
             <div ng-view></div>
 <div class="container">
     <!-- HEADER AND TODO COUNT -->
     <div class="jumbotron text-center">
-        <h1>Il y a <span class="label label-info">{{ nerds.length }}</span> personnes au Club Info !</h1>
+        <h1>Il y a <span class="label label-info">{{ membres.length }}</span> personnes au Club Info !</h1>
     </div>
-    <table id="nerd-list">
+    <table id="membre-list">
         <thead>
             <tr>
                 <th>Nom</th>
@@ -12,18 +12,18 @@
                 <th>Action</th>
             </tr>
         </thead>
-        <tbody ng-repeat="nerd in nerds">
+        <tbody ng-repeat="membre in membres">
             <tr>
-                <td>{{ nerd.login }}</td>
-                <td>{{ nerd.section }}</td>
-                <td>{{ nerd.role }}</td>
-                <td><button type="button" class="btn btn-danger" aria-label="Expulser" ng-click="deleteNerd(nerd._id)">
+                <td>{{ membre.login }}</td>
+                <td>{{ membre.section }}</td>
+                <td>{{ membre.role }}</td>
+                <td><button type="button" class="btn btn-danger" aria-label="Expulser" ng-click="deleteMembre(membre._id)">
                     <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
                     </button>
                 </td>
             </tr>
         </tbody>
-        <tfoot id="nerd-form">
+        <tfoot id="membre-form">
         <tr class="form-group">
             <td>
                 <input type="text" class="form-control input-lg" placeholder="Login" ng-model="formData.login">
@@ -35,7 +35,7 @@
                 <input type="text" class="form-control input-lg" placeholder="Rôle" ng-model="formData.role">
             </td>
             <td>
-                <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createNerd()">
+                <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createMembre()">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                 </button>
             </td>
-// server.js
-
-// modules =================================================
+// Modules ====================================================================
 var express = require('express');
 var app = express();
 var mongoose = require('mongoose');
@@ -8,47 +6,32 @@ var morgan = require(&#39;morgan&#39;);
 var bodyParser = require('body-parser');
 var methodOverride = require('method-override');
-// configuration ===========================================
-
-// config files
-var db = require('./config/db');
+// Application ================================================================
-// set our port
 var port = process.env.PORT || 8080;
-// connect to our mongoDB database 
-// (uncomment after you enter in your own credentials in config/db.js)
+// Connection à la BDD
+var db = require('./config/db');
 mongoose.connect(db.url);
-// get all data/stuff of the body (POST) parameters
-// parse application/json 
+// Tricks
 app.use(bodyParser.json());
-
-// parse application/vnd.api+json as json
 app.use(bodyParser.json({
     type: 'application/vnd.api+json'
 }));
-
-// parse application/x-www-form-urlencoded
 app.use(bodyParser.urlencoded({
     extended: true
 }));
-
-// override with the X-HTTP-Method-Override header in the request. simulate DELETE/PUT
 app.use(methodOverride('X-HTTP-Method-Override'));
-// set the static files location /public/img will be /img for users
+// Dossier public
 app.use(express.static(__dirname + '/public'));
-// routes ==================================================
-require('./app/routes')(app); // configure our routes
+// Routes
+require('./app/routes')(app);
-// start app ===============================================
-// startup our app at http://localhost:8080
 app.listen(port);
-// shoutout to the user                     
-console.log('Magic happens on port ' + port);
+console.log('La magie du CI se passe au port ' + port);
-// expose app           
 exports = module.exports = app;
 \ No newline at end of file