Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Website (only HTML) #34

Merged
merged 20 commits into from
Jan 14, 2020
Merged

Website (only HTML) #34

merged 20 commits into from
Jan 14, 2020

Conversation

maximiliani
Copy link
Member

@maximiliani maximiliani commented Oct 6, 2019 •
edited
Loading

#23 Different pages

@maximiliani maximiliani added this to the GUI milestone Oct 6, 2019
@maximiliani maximiliani requested a review from RaHoni October 6, 2019 19:52
@maximiliani maximiliani self-assigned this Oct 6, 2019
@maximiliani maximiliani closed this Oct 6, 2019
@maximiliani maximiliani reopened this Oct 6, 2019
RaHoni
RaHoni requested changes Oct 7, 2019
View reviewed changes
Copy link
Member

@RaHoni RaHoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should do some changes

src/main/scala/PrivateHome/id.xml Outdated Show resolved Hide resolved
src/main/scala/PrivateHome/devices.xml Outdated Show resolved Hide resolved
src/main/scala/PrivateHome/main.scala Outdated Show resolved Hide resolved
Maximilian Inckmann added 2 commits October 25, 2019 22:50
First pages
82bb971 
- Added some pages
- Added a menu
- Added first stylesheets
Menu
b7a3a7c 
did some code optimations
RaHoni
RaHoni requested changes Nov 13, 2019
View reviewed changes
Copy link
Member

@RaHoni RaHoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove .DS

Maximilian Inckmann and others added 8 commits November 13, 2019 21:54
First prototype for Device
180612e 
- own Settings Page for each one
- Short menu in Rooms and Devices with ON/OFF, Name and maybe Status
- did some work on Design
@maximiliani
Deleted .DS-Store
d7c4b01
@maximiliani
Deleted .DS-Store
c787abb
@maximiliani
Deleted .DS-Store
20359af
@maximiliani
Deleted .DS-Store
3bef514
@maximiliani
Deleted .DS-Store
9cbefdf
@maximiliani
Deleted .DS-Store
d0f0db8
@maximiliani
Deleted .DS-Store
1aaee20
maximiliani
maximiliani commented Nov 13, 2019
View reviewed changes
Copy link
Member Author

@maximiliani maximiliani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I removed all .DS-Store

@maximiliani maximiliani requested a review from RaHoni November 13, 2019 21:03
Maximilian Inckmann added 4 commits November 14, 2019 17:43
Added button design
b85fc26 
- button design
- begin with own page for each switch/device
- changed menu color
Merge branch 'feature/23-typesOfWebsites' of https://github.com/RaHon…
79a034d 
…i/PrivateHome into feature/23-typesOfWebsites
Improved button and menu
f0c2d91
Improved multi button design
4a541dd
RaHoni
RaHoni requested changes Nov 25, 2019
View reviewed changes
Copy link
Member

@RaHoni RaHoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ein bisschen was muss noch gemacht werden.

RaHoni
RaHoni reviewed Dec 3, 2019
View reviewed changes
Copy link
Member

@RaHoni RaHoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should make a js/code to generate the Website

RaHoni
RaHoni reviewed Dec 11, 2019
View reviewed changes
Copy link
Member

@RaHoni RaHoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thangs

RaHoni
RaHoni previously approved these changes Dec 11, 2019
View reviewed changes
RaHoni
RaHoni approved these changes Jan 14, 2020
View reviewed changes
Copy link
Member

@RaHoni RaHoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks allrigth

@RaHoni RaHoni merged commit 162bd21 into Dev Jan 14, 2020
maximiliani
maximiliani commented Jan 14, 2020
View reviewed changes
Copy link
Member Author

@maximiliani maximiliani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything ok

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaHoni RaHoni RaHoni approved these changes

Assignees

@maximiliani maximiliani

Labels
None yet
Projects
None yet
Milestone
GUI
Development

Successfully merging this pull request may close these issues.
2 participants
@maximiliani @RaHoni