Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Conflicts:
	backlog.sql
	backlog/include/classes.php
  • Loading branch information
@Compizfox
Compizfox committed May 28, 2014
2 parents 1b69e61 + 086a823 commit a762d7d
Show file tree
Hide file tree
Showing 26 changed files with 829 additions and 291 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Every game has a status attached, like:
Bootstrap is written in PHP. The design is based on Bootstrap with the Bootswatch Slate theme. Charts are powered by ChartJS. Besides jQuery, it also uses jQuery UI.

### Database design
![](http://srv.tuxplace.nl/hosted/backlog_screenshots/Screenshot_6.png)
![](http://srv.tuxplace.nl/hosted/backlog_screenshots/Screenshot_7.png)

### Development status
As you might have guessed, Backlog is heavily in development. There is no stable/ready for use release yet. You should regard it as WIP/alpha.
Expand Down
56 changes: 0 additions & 56 deletions TODO.md
View file

This file was deleted.

155 changes: 109 additions & 46 deletions backlog.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- http://www.phpmyadmin.net
--
-- Machine: localhost
-- Gegenereerd op: 26 mei 2014 om 14:42
-- Gegenereerd op: 28 mei 2014 om 21:44
-- Serverversie: 5.5.37-1
-- PHP-versie: 5.5.12-2

Expand All @@ -22,6 +22,17 @@ SET time_zone = "+00:00";

-- --------------------------------------------------------

--
-- Tabelstructuur voor tabel `cache`
--

CREATE TABLE IF NOT EXISTS `cache` (
`index` varchar(25) NOT NULL,
`value` text NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

--
-- Tabelstructuur voor tabel `dlc`
--
Expand All @@ -32,7 +43,7 @@ CREATE TABLE IF NOT EXISTS `dlc` (
`status_id` int(11) NOT NULL,
`note` varchar(255) CHARACTER SET latin1 NOT NULL,
`game_id` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

-- --------------------------------------------------------

Expand All @@ -49,7 +60,8 @@ CREATE TABLE IF NOT EXISTS `game` (
`playtime` int(11) NOT NULL,
`img_icon_url` varchar(40) DEFAULT NULL,
`img_logo_url` varchar(40) DEFAULT NULL,
`appid_lock` tinyint(4) NOT NULL
`appid_lock` tinyint(4) NOT NULL,
`hidden` tinyint(1) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

-- --------------------------------------------------------
Expand All @@ -76,15 +88,19 @@ CREATE TABLE IF NOT EXISTS `library` (
`library_id` int(11) NOT NULL,
`css_url` varchar(255) NOT NULL,
`js_url` varchar(255) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ;

--
-- Gegevens worden geëxporteerd voor tabel `library`
--

INSERT INTO `library` (`library_id`, `css_url`, `js_url`) VALUES
(1, '//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.4/css/jquery-ui.min.css', '//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js'),
(2, '', '//cdnjs.cloudflare.com/ajax/libs/Chart.js/0.2.0/Chart.min.js');
(2, '', '//cdnjs.cloudflare.com/ajax/libs/Chart.js/0.2.0/Chart.min.js'),
(3, '', 'js/autocorrect.php'),
(4, '', 'js/add.js'),
(5, '', 'js/checkall.js'),
(6, '', 'js/statuses.js');

-- --------------------------------------------------------

Expand All @@ -99,35 +115,38 @@ CREATE TABLE IF NOT EXISTS `menu` (
`scope` varchar(25) NOT NULL,
`options` varchar(25) NOT NULL,
`title` varchar(255) CHARACTER SET latin1 NOT NULL,
`glyphicon` varchar(255) NOT NULL,
`library_id` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=77 ;
`glyphicon` varchar(255) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=80 ;

--
-- Gegevens worden geëxporteerd voor tabel `menu`
--

INSERT INTO `menu` (`id`, `parent_id`, `page`, `scope`, `options`, `title`, `glyphicon`, `library_id`) VALUES
(50, 1, 'overzicht', '', '', 'Summary', 'glyphicon-stats', 2),
(54, 1, 'purchases', '', '', 'Purchases', 'glyphicon-shopping-cart', NULL),
(57, 61, 'games', 'uncompleted', '', 'Uncompleted games', 'glyphicon-exclamation-sign', NULL),
(58, 61, 'games', 'completed', '', 'Completed games', 'glyphicon-ok-sign', NULL),
(59, 0, 'add', '', '', 'Add', 'glyphicon-plus', 1),
(61, 1, 'games', 'all', '', 'Games', 'glyphicon-play', NULL),
(62, 1, 'dlc', 'all', '', 'DLC', 'glyphicon-download', NULL),
(63, -1, 'modifygame', '', '', 'Modify game', '', NULL),
(64, -1, 'games', 'purchase', '', 'Games in purchase', '', NULL),
(66, -1, 'modifypurchase', '', '', 'Modify purchase', '', NULL),
(67, -1, 'modifydlc', '', '', 'Modify DLC', '', NULL),
(68, 62, 'dlc', 'uncompleted', '', 'Uncompleted DLC', 'glyphicon-exclamation-sign', NULL),
(69, 62, 'dlc', 'completed', '', 'Completed DLC', 'glyphicon-ok-sign', NULL),
(70, -1, 'dlc', 'game', '', 'DLC in game', '', NULL),
(71, 0, 'steam', '', '', 'Steam', 'fa fa-steam', NULL),
(72, 71, 'steam', '', '&syncappids', 'Link games with Steam', 'glyphicon-link', NULL),
(73, 71, 'steam', '', '&syncplaytime', 'Sync playtime with Steam', 'glyphicon-time', NULL),
(74, 71, 'steam', '', '&syncicons', 'Retrieve icons/logos', 'glyphicon-picture', NULL),
(75, 71, 'steam', '', '&addgames', 'Import games from Steam', 'glyphicon-import', NULL),
(76, 0, 'settings', '', '', 'Settings', 'glyphicon-wrench', NULL);
INSERT INTO `menu` (`id`, `parent_id`, `page`, `scope`, `options`, `title`, `glyphicon`) VALUES
(50, 1, 'overzicht', '', '', 'Summary', 'glyphicon-stats'),
(51, 1, 'history', '', '', 'History', 'fa fa-history'),
(54, 1, 'purchases', '', '', 'Purchases', 'glyphicon-shopping-cart'),
(57, 61, 'games', 'uncompleted', '', 'Uncompleted games', 'glyphicon-exclamation-sign'),
(58, 61, 'games', 'completed', '', 'Completed games', 'glyphicon-ok-sign'),
(59, 0, 'add', '', '', 'Add', 'glyphicon-plus'),
(61, 1, 'games', 'all', '', 'Games', 'glyphicon-play'),
(62, 1, 'dlc', 'all', '', 'DLC', 'glyphicon-download'),
(63, -1, 'modifygame', '', '', 'Modify game', ''),
(64, -1, 'games', 'purchase', '', 'Games in purchase', ''),
(66, -1, 'modifypurchase', '', '', 'Modify purchase', ''),
(67, -1, 'modifydlc', '', '', 'Modify DLC', ''),
(68, 62, 'dlc', 'uncompleted', '', 'Uncompleted DLC', 'glyphicon-exclamation-sign'),
(69, 62, 'dlc', 'completed', '', 'Completed DLC', 'glyphicon-ok-sign'),
(70, -1, 'dlc', 'game', '', 'DLC in game', ''),
(71, 0, 'steam', '', '', 'Steam', 'fa fa-steam'),
(72, 71, 'steam', '', '&syncappids', 'Link games with Steam', 'glyphicon-link'),
(73, 71, 'steam', '', '&syncplaytime', 'Sync playtime with Steam', 'glyphicon-time'),
(74, 71, 'steam', '', '&syncicons', 'Retrieve icons/logos', 'glyphicon-picture'),
(75, 71, 'steam', '', '&addgames', 'Import games from Steam', 'glyphicon-import'),
(76, 0, 'settings', '', '', 'Settings', 'glyphicon-wrench'),
(77, 61, 'games', 'orphaned', '', 'Orphaned games', 'fa fa-chain-broken'),
(78, 71, 'steam', '', '&refreshuserstats', 'Refresh user stats', 'glyphicon-refresh'),
(79, 71, 'steam', '', '&all', 'Steam', 'fa fa-steam');

-- --------------------------------------------------------

Expand All @@ -138,9 +157,9 @@ INSERT INTO `menu` (`id`, `parent_id`, `page`, `scope`, `options`, `title`, `gly
CREATE TABLE IF NOT EXISTS `purchase` (
`purchase_id` int(11) NOT NULL,
`shop` varchar(255) NOT NULL,
`price` decimal(10,0) DEFAULT NULL,
`price` decimal(10,2) DEFAULT NULL,
`valuta` char(1) NOT NULL,
`date` date NOT NULL,
`date` date DEFAULT NULL,
`note` varchar(255) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

Expand All @@ -154,21 +173,53 @@ CREATE TABLE IF NOT EXISTS `status` (
`status_id` int(11) NOT NULL,
`name` varchar(255) CHARACTER SET latin1 NOT NULL,
`completed` tinyint(1) NOT NULL,
`color` varchar(6) NOT NULL
`color` varchar(7) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ;

--
-- Gegevens worden geëxporteerd voor tabel `status`
--

INSERT INTO `status` (`status_id`, `name`, `completed`, `color`) VALUES
(1, 'Untouched', 0, 'c0392b'),
(2, 'Started playing', 0, 'f1c40f'),
(3, 'Finished', 1, '2ecc71'),
(4, 'Finished campaign', 1, '27ae60'),
(5, 'Multiplayer/AI only', 1, 'f39c12'),
(6, 'Gave up', 0, 'e74c3c'),
(7, 'Prequel not finished yet', 0, 'e67e22');
(1, 'Untouched', 0, '#c0392b'),
(2, 'Started playing', 0, '#f1c40f'),
(3, 'Finished', 1, '#2ecc71'),
(4, 'Finished campaign', 1, '#27ae60'),
(5, 'Multiplayer/AI only', 1, '#f39c12'),
(6, 'Gave up', 0, '#e74c3c'),
(7, 'Prequel not finished yet', 0, '#e67e22');

-- --------------------------------------------------------

--
-- Tabelstructuur voor tabel `xref_menu_library`
--

CREATE TABLE IF NOT EXISTS `xref_menu_library` (
`menu_id` int(11) NOT NULL,
`library_id` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Gegevens worden geëxporteerd voor tabel `xref_menu_library`
--

INSERT INTO `xref_menu_library` (`menu_id`, `library_id`) VALUES
(50, 2),
(59, 1),
(59, 3),
(59, 4),
(54, 5),
(57, 5),
(58, 5),
(61, 5),
(62, 5),
(68, 5),
(69, 5),
(70, 5),
(64, 5),
(76, 5),
(76, 6);

-- --------------------------------------------------------

Expand All @@ -181,11 +232,16 @@ CREATE TABLE IF NOT EXISTS `xref_purchase_game` (
`game_id` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;


--
-- Indexen voor geëxporteerde tabellen
--

--
-- Indexen voor tabel `cache`
--
ALTER TABLE `cache`
ADD PRIMARY KEY (`index`);

--
-- Indexen voor tabel `dlc`
--
Expand Down Expand Up @@ -214,7 +270,7 @@ ALTER TABLE `library`
-- Indexen voor tabel `menu`
--
ALTER TABLE `menu`
ADD PRIMARY KEY (`id`), ADD KEY `parent_id` (`parent_id`), ADD KEY `libraries` (`library_id`);
ADD PRIMARY KEY (`id`), ADD KEY `parent_id` (`parent_id`);

--
-- Indexen voor tabel `purchase`
Expand All @@ -228,6 +284,12 @@ ALTER TABLE `purchase`
ALTER TABLE `status`
ADD PRIMARY KEY (`status_id`);

--
-- Indexen voor tabel `xref_menu_library`
--
ALTER TABLE `xref_menu_library`
ADD KEY `library_id` (`library_id`), ADD KEY `menu_id` (`menu_id`);

--
-- Indexen voor tabel `xref_purchase_game`
--
Expand Down Expand Up @@ -257,12 +319,12 @@ MODIFY `history_id` int(11) NOT NULL AUTO_INCREMENT;
-- AUTO_INCREMENT voor een tabel `library`
--
ALTER TABLE `library`
MODIFY `library_id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3;
MODIFY `library_id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=7;
--
-- AUTO_INCREMENT voor een tabel `menu`
--
ALTER TABLE `menu`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=77;
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=80;
--
-- AUTO_INCREMENT voor een tabel `purchase`
--
Expand Down Expand Up @@ -300,10 +362,11 @@ ADD CONSTRAINT `history_ibfk_3` FOREIGN KEY (`old_status`) REFERENCES `status` (
ADD CONSTRAINT `history_ibfk_4` FOREIGN KEY (`new_status`) REFERENCES `status` (`status_id`);

--
-- Beperkingen voor tabel `menu`
-- Beperkingen voor tabel `xref_menu_library`
--
ALTER TABLE `menu`
ADD CONSTRAINT `menu_ibfk_1` FOREIGN KEY (`library_id`) REFERENCES `library` (`library_id`);
ALTER TABLE `xref_menu_library`
ADD CONSTRAINT `xref_menu_library_ibfk_2` FOREIGN KEY (`library_id`) REFERENCES `library` (`library_id`),
ADD CONSTRAINT `xref_menu_library_ibfk_1` FOREIGN KEY (`menu_id`) REFERENCES `menu` (`id`);

--
-- Beperkingen voor tabel `xref_purchase_game`
Expand Down
Loading

0 comments on commit a762d7d

Please sign in to comment.