Skip to content

Commit

Permalink
Merge pull request #24 from meyskens/rebrand
Browse files Browse the repository at this point in the history
Rebrand
  • Loading branch information
meyskens authored Nov 12, 2018
2 parents 36303cd + 3443684 commit da27106
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
TalkTimer
TalksTimer
=========

TalkTimer is a project that helps by timing conference/meetup talks by offering a 2 part timer. You can see this as a timer screen that you can remote control and send messages to.
TalksTimer is a project that helps by timing conference/meetup talks by offering a 2 part timer. You can see this as a timer screen that you can remote control and send messages to.
It starts by creating a session, this session gives you a key and the ability to change the time. When you enter this key on a 2nd screen (for the presenter) it will show you the timer.
TalkTimer counts down on the server side, so it will continue should the controller/client disconnect.
TalksTimer counts down on the server side, so it will continue should the controller/client disconnect.

## How to use
It's far from ready yet, come back later!
Expand Down
4 changes: 2 additions & 2 deletions frontend/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

<head>
<meta charset="utf-8">
<title>TalkTimer</title>
<title>TalksTimer</title>
</head>

<body>
<div id="app"></div>
<script src="/dist/build.js"></script>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TalkTimer frontend
# TalksTimer frontend

## Build Setup

Expand Down
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="utf-8">
<title>TalkTimer</title>
<title>TalksTimer</title>
<!--Import Google Icon Font-->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono" rel="stylesheet">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/layouts/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div>
<nav>
<div class="nav-wrapper">
<a href="#" class="brand-logo">TalkTimer</a>
<a href="#" class="brand-logo">TalksTimer</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><router-link to="/">Home</router-link></li>
<li><router-link to="/about">Test</router-link></li>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Home.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<main-layout>
<div class="container">
<h2 class="center-align">Welcome to TalkTimer</h2>
<p class="center-align">TalkTimer is a remote controllable timer designed to signal the time and messages to presenters</p>
<h2 class="center-align">Welcome to TalksTimer</h2>
<p class="center-align">TalksTimer is a remote controllable timer designed to signal the time and messages to presenters</p>
<p class="center-align">
<a class="waves-effect waves-light btn-large" v-on:click="newSession"><i class="material-icons left">add_circle</i>Start Session</a>
</p>
Expand Down

0 comments on commit da27106

Please sign in to comment.