Merge Jay's Branch to Master by Joe12o · Pull Request #1 · jayricco/TheraMe

Joe12o · 2018-03-28T17:42:54Z

Will be using this to go through and comment on any issues I see.

# Conflicts: # src/main/java/com/therame/controllers/UserController.java # src/main/java/com/therame/model/User.java # src/main/java/com/therame/service/MediaResolverService.java # src/main/java/com/therame/service/UserServiceImpl.java # src/main/resources/application.properties # src/main/resources/templates/login.html # src/main/resources/templates/registration.html

Got it to run again, with ssl, merged in my upload which is a little more organized but we'll have to work on merging in the REST functionality.

…ink we really want that.. do we?

…el user for adding admin accounts. All the registered users now can't log in because we need to do the account init. so that's gonna come next I'd assume!

…n? I'm confused there

…y_feb4_dev01 # Conflicts: # src/main/resources/application.properties

…ar as I can see. Also everything's in ssl now.

…at master has plus my additions

- exercise and user in order to index them for search. my web pages are still messed up but I'll take a look at that when I get the chance

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Everything works now!

…y_feb4_dev01

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Fixed some of the jquery stuff, adding in the ability to autocomplete search results

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Dying of Solr

…yricco/Thera-Me into jay_feb4_dev01

…y_feb4_dev01

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Added some stuff for the login api

…y_feb4_dev01 # Conflicts: # src/main/java/com/therame/controllers/UserController.java

# Conflicts: # src/main/java/com/therame/controllers/UserController.java

Joe12o · 2018-03-28T17:44:04Z

+      - exercise
+
+volumes:
+  data:


Can you update the readme with docs on how to set up solr?

Joe12o · 2018-03-28T17:45:17Z

+
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>


Are all of these actually being used?

Joe12o · 2018-03-28T17:47:41Z

+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new SimpleAsyncUncaughtExceptionHandler();
+    }


Are these additions necessary? Were you running into problems with the default config?

Joe12o · 2018-03-28T17:50:06Z

+                            .setTimeToLiveSeconds(20)
+                );
+    }
+}


What value does hazelcast add to our project? Also, what is it actually being used for?

Joe12o · 2018-03-28T17:52:35Z

+import org.springframework.data.solr.server.support.HttpSolrClientFactoryBean;
+
+@Configuration
+@ComponentScan


What is @ComponentScan doing in this situation?

Joe12o · 2018-03-28T18:48:32Z

@@ -1 +0,0 @@
-(function(root){"use strict";var css=".nanobar{width:100%;height:4px;z-index:9999;top:0}.bar{width:0;height:100%;transition:height .3s;background:#000}";function addCss(){var s=document.getElementById("nanobarcss");if(s===null){s=document.createElement("style");s.type="text/css";s.id="nanobarcss";document.head.insertBefore(s,document.head.firstChild);if(!s.styleSheet)return s.appendChild(document.createTextNode(css));s.styleSheet.cssText=css}}function addClass(el,cls){if(el.classList)el.classList.add(cls);else el.className+=" "+cls}function createBar(rm){var el=document.createElement("div"),width=0,here=0,on=0,bar={el:el,go:go};addClass(el,"bar");function move(){var dist=width-here;if(dist<.1&&dist>-.1){place(here);on=0;if(width>=100){el.style.height=0;setTimeout(function(){rm(el)},300)}}else{place(width-dist/4);setTimeout(go,16)}}function place(num){width=num;el.style.width=width+"%"}function go(num){if(num>=0){here=num;if(!on){on=1;move()}}else if(on){move()}}return bar}function Nanobar(opts){opts=opts||{};var el=document.createElement("div"),applyGo,nanobar={el:el,go:function(p){applyGo(p);if(p>=100){init()}}};function rm(child){el.removeChild(child)}function init(){var bar=createBar(rm);el.appendChild(bar.el);applyGo=bar.go}addCss();addClass(el,"nanobar");if(opts.id)el.id=opts.id;if(opts.classname)addClass(el,opts.classname);if(opts.target){el.style.position="relative";opts.target.insertBefore(el,opts.target.firstChild)}else{el.style.position="fixed";document.getElementsByTagName("body")[0].appendChild(el)}init();return nanobar}if(typeof exports==="object"){module.exports=Nanobar}else if(typeof define==="function"&&define.amd){define([],function(){return Nanobar})}else{root.Nanobar=Nanobar}})(this);


I think this was a mistake, we still depend on nanobar in other places

Joe12o · 2018-03-28T18:54:46Z

+        delimiter: ",",
+        transformResult: function(response) {
+            return {
+                //must convert json to javascript object before processing


I don't think this is true, but I don't know enough about the autocomplete function to dispute it. Will look later

Joe12o · 2018-03-28T18:56:28Z

+            });
+        });
+        //]]>
+    </script>


Isn't this the same as confirm.js?

Joe12o · 2018-03-28T18:58:28Z

+        <!--<script th:src="@{/js/registration.js}"></script>-->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
+    </body>
+</html>


Why couldn't the old registration.html and registration.js be used? All you'd need to do is remove the password fields as far as I can tell.

Joe12o · 2018-03-28T18:58:46Z

+</div>
+
+</body>
+</html>


What is this?

Joe12o · 2018-03-28T21:37:33Z

+            try {
+                exercises = exerciseService.searchExercisesByTitle(query);
+                System.out.println(exercises);
+            } catch (Exception e) {


What exception is being caught here? Do want really just want to swallow it and tell the client it was a bad request?

Joe12o · 2018-03-28T21:39:04Z

+            exercises = exerciseService.findAllExercises();
+        }
+        if (exercises == null) {
+            return ResponseEntity.badRequest().body(query);


Is it really a bad request if the only way to get here is from solr errors?

Joe12o · 2018-03-28T21:41:47Z

    }

-    @RequestMapping(value="/login", method = RequestMethod.GET)
+    @RequestMapping(value="/login")


Maybe use @GetMapping, this request now accepts all types of requests when we should narrow it to just get requests.

Joe12o · 2018-03-28T21:43:28Z

    }
+
+    public boolean isCompleteAtCurrentTime() {
+        LocalTime current_time = LocalTime.now();


Do we want to deal with the complexity that time zones add? I personally wanted to avoid it

Joe12o · 2018-03-28T21:46:32Z

+
+
+
+}


What is this? If its a combination of the patient_attempt and patient_response tables, I'm unsure if we should do this.

In general, I think we should try to stick with the ERD we have in the SDS.

Joe12o · 2018-03-28T21:47:58Z

+    private FeedbackType feedbackType;
+
+    @Column(name = "message_data")
+    private StringBuffer message;


Why is this a StringBuffer? We're not going to be modifying these messages so it doesn't really make sense here

Joe12o · 2018-03-28T21:49:28Z

+        CompletionRecord,
+        Feedback
+    }
+    public enum FeedbackType {


This might be useful if we were going to continue work on this project, but we won't be making any distinction between the types in our final product, so why make the distinction here?

Joe12o · 2018-03-28T21:52:58Z

+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}


Why does this file exist

Joe12o · 2018-03-28T21:55:18Z

+        .replace(/\\t/g, "\\t")
+        .replace(/\\b/g, "\\b")
+        .replace(/\\f/g, "\\f");
+};


Where is this used and why do we need to escape the special characters

Joe12o · 2018-03-28T21:56:17Z

+
+
+
+    <script th:src="@{js/fv.min.js}"></script>


This script doesn't exist

Joe12o · 2018-03-28T21:57:57Z

-        <script th:src="@{/js/nanobar.min.js}"></script>
+        <script th:src="@{/js/thirdparty/jquery-3.3.1.min.js}"></script>
+        <script th:src="@{/js/thirdparty/jquery.autocomplete.min.js}"></script>
+        <script th:src="@{/js/thirdparty/nanobar.min.js}"></script>


None of these scripts exist in the git repo

# Conflicts: # src/main/java/com/therame/controllers/UserController.java

…y_feb4_dev01 # Conflicts: # src/main/java/com/therame/configuration/WebSecurityConfig.java # src/main/java/com/therame/model/Exercise.java # src/main/java/com/therame/service/ExerciseServiceImpl.java # src/main/java/com/therame/service/HistoryService.java # src/main/java/com/therame/service/UserServiceImpl.java # src/main/resources/templates/registration.html

…y_feb4_dev01 # Conflicts: # src/main/java/com/therame/controllers/HistoryController.java # src/main/java/com/therame/model/Feedback.java # src/main/java/com/therame/model/History.java # src/main/java/com/therame/repository/jpa/AssignmentRepository.java # src/main/java/com/therame/repository/jpa/FeedbackRepository.java # src/main/java/com/therame/repository/jpa/HistoryRepository.java # src/main/java/com/therame/service/HistoryService.java # src/main/java/com/therame/service/HistoryServiceImpl.java # src/main/java/com/therame/view/HistoryView.java # src/main/resources/templates/user.html

jayricco added 29 commits February 16, 2018 12:22

You can now upload some files!

1044764

Getting things ready for a merge!

7a9bb32

Getting things ready for a merge!

eb04972

Merge branch 'master' into jay_feb4_dev01

4605f96

Got it to run again, with ssl, merged in my upload which is a little more organized but we'll have to work on merging in the REST functionality.

Fixed a thymeleaf problem. We had it in LEGACYHTML5 mode - I don't th…

dedf8bf

…ink we really want that.. do we?

Database works again, you can register users - need to work on sentin…

55e1860

…el user for adding admin accounts. All the registered users now can't log in because we need to do the account init. so that's gonna come next I'd assume!

registration stuff

25e5153

Merged everything together - need to figure out the upload integratio…

be52aee

…n? I'm confused there

Pushing another update for merge control

e7c3db7

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

b87b85a

…y_feb4_dev01 # Conflicts: # src/main/resources/application.properties

Merged in master again, fixed conflicts - everything works here! as f…

05a308a

…ar as I can see. Also everything's in ssl now.

added an http connector for allowing redirects to ssl secured ports.

b8c8e80

fixed some package messups for user repo and user service

9e5e3a6

I think I've done some more cleaning - this should have everything th…

c0981b0

…at master has plus my additions

oh boy

13faa0c

oh boy

4072c01

Added solr configurations, updated repositories

5fd5c83

- exercise and user in order to index them for search. my web pages are still messed up but I'll take a look at that when I get the chance

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

c41f80d

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Everything works now!

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

37cf84e

…y_feb4_dev01

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

5c3840d

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Fixed some of the jquery stuff, adding in the ability to autocomplete search results

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

69b8a36

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Dying of Solr

Merge branches 'jay_feb4_dev01' and 'master' of https://github.com/ja…

ad435c3

…yricco/Thera-Me into jay_feb4_dev01

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

13a7946

…y_feb4_dev01

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

7e081b5

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Added some stuff for the login api

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

1b8f528

…y_feb4_dev01 # Conflicts: # src/main/resources/templates/home.html # src/main/resources/templates/pt_home.html Added some stuff for the login api

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

3f66dee

…y_feb4_dev01 # Conflicts: # src/main/java/com/therame/controllers/UserController.java

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

225e5ec

…y_feb4_dev01 # Conflicts: # src/main/java/com/therame/controllers/UserController.java

Merge branch 'master' of https://github.com/jayricco/Thera-Me into ja…

62ee3e8

…y_feb4_dev01 # Conflicts: # src/main/java/com/therame/controllers/UserController.java

Joe12o self-assigned this Mar 28, 2018

jayricco added 2 commits March 28, 2018 15:32

Added the login api... just need to fix formlogin

293f199

# Conflicts: # src/main/java/com/therame/controllers/UserController.java

Added the login api... just need to fix formlogin

8df6bec

# Conflicts: # src/main/java/com/therame/controllers/UserController.java

Joe12o assigned jayricco and unassigned Joe12o Mar 28, 2018

Joe12o commented Mar 28, 2018

View reviewed changes

jayricco added 6 commits March 31, 2018 10:50

Added the login api... just need to fix formlogin

966729c

# Conflicts: # src/main/java/com/therame/controllers/UserController.java

		@@ -1 +0,0 @@
		(function(root){"use strict";var css=".nanobar{width:100%;height:4px;z-index:9999;top:0}.bar{width:0;height:100%;transition:height .3s;background:#000}";function addCss(){var s=document.getElementById("nanobarcss");if(s===null){s=document.createElement("style");s.type="text/css";s.id="nanobarcss";document.head.insertBefore(s,document.head.firstChild);if(!s.styleSheet)return s.appendChild(document.createTextNode(css));s.styleSheet.cssText=css}}function addClass(el,cls){if(el.classList)el.classList.add(cls);else el.className+=" "+cls}function createBar(rm){var el=document.createElement("div"),width=0,here=0,on=0,bar={el:el,go:go};addClass(el,"bar");function move(){var dist=width-here;if(dist<.1&&dist>-.1){place(here);on=0;if(width>=100){el.style.height=0;setTimeout(function(){rm(el)},300)}}else{place(width-dist/4);setTimeout(go,16)}}function place(num){width=num;el.style.width=width+"%"}function go(num){if(num>=0){here=num;if(!on){on=1;move()}}else if(on){move()}}return bar}function Nanobar(opts){opts=opts\|\|{};var el=document.createElement("div"),applyGo,nanobar={el:el,go:function(p){applyGo(p);if(p>=100){init()}}};function rm(child){el.removeChild(child)}function init(){var bar=createBar(rm);el.appendChild(bar.el);applyGo=bar.go}addCss();addClass(el,"nanobar");if(opts.id)el.id=opts.id;if(opts.classname)addClass(el,opts.classname);if(opts.target){el.style.position="relative";opts.target.insertBefore(el,opts.target.firstChild)}else{el.style.position="fixed";document.getElementsByTagName("body")[0].appendChild(el)}init();return nanobar}if(typeof exports==="object"){module.exports=Nanobar}else if(typeof define==="function"&&define.amd){define([],function(){return Nanobar})}else{root.Nanobar=Nanobar}})(this); No newline at end of file

+              </div>
+              </body>
+              </html>

                
                    No newline at end of file

Conversation

Joe12o commented Mar 28, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants