-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy path_Shiung.txt
161 lines (128 loc) · 5.66 KB
/
_Shiung.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
150720
== Log 1 ==
Hi, Shiung here!
Testing out the GitHub Synch thingy.
Meeting access denied errors from the direct clone, hence I'm forking it to my repository to try out pull requests!
Added in the WIP branch.
Mistakenly committed the first commit to Masters.
Sent a Pull Request.
Pull Request approved.
150721
== Log 2 ==
Testing out synchronizing with an update remote "Original" repository.
Testing out synchronizing updates of the "Original" remote repository to the "Personal" remote repository before getting it down to the "Local" repository.
Seems like the addition of "git remote add <name> <remote_repository_url>" is required to be done locally, pushed remotely, and synched remotely before doing it locally.
Things to be added:
1. "git remote -v" to check current branches available of the local directory (file).
2. "git remote add <name> <original_remote_repository_URL>" if required. Meaning that only one remote repository listed.
3. "git fetch <original_remote_repository_NAME>" based on the names listed by "git remote -v" to synchronize the branch.
4. "git merge <name/branch> <personal_wip_branch>" to merge changes of the "Original" repository branch to the local directory(file).
5. "git status" to checkout the changes, "git branch" to ensure you're on the right branch, and "git push" to update the personal remote GitHub branch.
6. Test if everything works. Operation validation step.
7. "git checkout master" switch to master branch on personal repository.
8. "git merge <personal_wip_branch> master" to merge the altered branch to the local master branch.
9. "git checkout <personal_wip_branch>" to move back to WIP branch.
OPTIONAL - Used only if the branch synched in was not to the WIP branch (had something working here). After step 8.
1. "git branch -d <branch>" to delete the remote branch as clean up.
2. "git checkout -b <new_personal_wip_branch>" to make a new branch. OR
3. "git checkout <personal_wip_branch>"
150722
== Log 3 ==
Creation of Snippet scaffold.
Removed comments of routes.rb.
Scaffolded data columns:
snippet_id auto-gen integer
snippet_title string
snippet_description text
snippet_content text
snippet_view_count integer auto-increase
Foreign key insertion:
snippet_creator user_id
For Favorite table:
favorite_id auto-generated
user_id user_id
snippet_id snippet_id
Obstacles:
Formatting of index page for main Snippets view.
Database association
Database manipulation
Foreign key insertion
Data extraction from Database
Solution:
Checking out tutorial for making a blog with RoR.
150727
== Log 4 ==
DONE: Merged in new segments contributed from others.
DONE: Added in a Favourite resource to the project.
150728
== Log 5 ==
TODO: Reminder to ask for the latest working version.
TODO: Work on associating User, Snippet, and Favourite table.
TODO: Go through recommended resources.
150729
== Log 6 ==
Created snapshot_150729 branch to log previous changes.
Merged in new fetch from singchow on JS file.
Removed and recreated Favourite to Favorite scaffolding resource.
Thinking of adding in comments after going through the tutorial.
150730
== Log 7 ==
Associated One User to Many Snippets.
Merged in updates from remote branch.
150731
== Log 8 ==
Merged things into the new file. Updated things with the remote branch.
150803
== Log 9 ==
Remove all printed errors.
All available links/buttons must be working.
150804
== Log 10 ==
Configured outlook of Snippets
<div class="footer navbar-fixed-bottom"> to keep the footer bar down.
Adding Impressionist gem for page counting.
150805
== Log 11 ==
Configured Users _form to have password and email fields.
Hid Password of Users on users_index.
Tweaked Snippet/View Index, Show, and Edit.
Aligned with main project.
Commented out links on dashboard that did not work.
Footer go to top link.
Profile Pic link.
DONE: Make sure the Snippet creation process has no errors.
150806
== Log 12 ==
Configured linking of Snippet table to User table correctly with a Foreign Key connect.
Updated Location and Routing of Snippets in the application.
150807
== Log 13 ==
Updated text_field of User/View/_form to email_field.
Formatted code and updated context of Landing Page for better readability.
Set up external links to social sites represented by the logos at the bottom of the Landing Page.
TODO: Beautify Snippet related stuff.
FIX: The routing HACK of the back button.
TODO: Include side bar navigation.
150808
== Log 14 ==
Unable to log in! Used "rails console" to log in!
Configured side bar and header to show on the Snippets by inserting it into "snippet_layout.html.erb".
Devise issue!
TODO: Fix the weird horizontal scrollable thing on show.
TODO: Port view changes to include other components.
DONE: Ensure that the features remain with the views.
DONE: Changed the routing of the "Back" button to Index on Snippet Show and View.
* Changed all redirecting button_to into link_to on Snippets
* Commented out JavaScript. Might remove it after confirmation.
DONE: Make the footer visible immediately when requested.
* Added navbar-fixed-bottom to footer class.
* Removed site-min-height on main content wrapper section class to remove scrolling
* Reverted site-min-height to solve blank white space under table.
150809
== Log 15 ==
TODO: Clean up code with "dashboard_layout.html.erb".
Necessary to have type:"button" on the link_buttons?
BUG: Sidebar focus highlight jumps to Global Snippets even though the Snippet is accessed through the Personal Snippets tab.
QUES: What does the mt class do?
QUES: What does the loading class do?
FIND: Horizontal scrolling action doesn't occur if the horizontal length of the code doesn't exceed the extension.